Merge remote branch 'origin/upstream-cvs' into upstream
authorBernd Zeimetz <bernd@bzed.de>
Tue, 4 May 2010 21:58:11 +0000 (23:58 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Tue, 4 May 2010 21:58:11 +0000 (23:58 +0200)

Trivial merge